merge from trunk

author Joakim Verona <joakim@verona.se>

Wed, 11 Sep 2013 05:34:43 +0000 (07:34 +0200)

committer Joakim Verona <joakim@verona.se>

Wed, 11 Sep 2013 05:34:43 +0000 (07:34 +0200)
author Joakim Verona <joakim@verona.se>
Wed, 11 Sep 2013 05:34:43 +0000 (07:34 +0200)
committer Joakim Verona <joakim@verona.se>
Wed, 11 Sep 2013 05:34:43 +0000 (07:34 +0200)
diff --cc src/keyboard.c
Simple merge
diff --cc src/lisp.h
Simple merge
author	Joakim Verona <joakim@verona.se>
	Wed, 11 Sep 2013 05:34:43 +0000 (07:34 +0200)
committer	Joakim Verona <joakim@verona.se>
	Wed, 11 Sep 2013 05:34:43 +0000 (07:34 +0200)
		1	2
src/keyboard.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/lisp.h	patch \|	diff1 \|	diff2 \|	blob \| history